From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 19 Jan 2012 00:44:30 +0000 (-0500)
Subject: extensionSystem: Fix an error related to extension importing
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7093
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2f27b94757e58216658d4a5d5bb91b2ce8d73497;p=gnome-shell.git

extensionSystem: Fix an error related to extension importing

If an extension fails to import, we will pass the error object
to logExtensionError, which fails to pass it onto DBus as an
error object is not a string. To fix, convert the error object
to a string before passing it to logExtensionError.

https://bugzilla.gnome.org/show_bug.cgi?id=668429
---

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 23470e153..e7eea667c 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -394,7 +394,7 @@ function loadExtension(dir, type, enabled) {
     } catch (e) {
         if (stylesheetPath != null)
             theme.unload_stylesheet(stylesheetPath);
-        logExtensionError(uuid, e);
+        logExtensionError(uuid, '' + e);
         return;
     }